Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 2 Apr 2010 14:34:08 +0000 (14:34 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 2 Apr 2010 14:34:08 +0000 (14:34 +0000)

Trivial merge